Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Contact DLC JointRails #1181

Merged
merged 9 commits into from
Jul 26, 2019
Merged

Add Contact DLC JointRails #1181

merged 9 commits into from
Jul 26, 2019

Conversation

dedmen
Copy link
Contributor

@dedmen dedmen commented Jul 25, 2019

Is not tested yet as I don't have Contact installed.
Especially muzzle_tma_65 needs testing with all current 6.5 weapons.

We have a incoming problem in that there will be contact-DLC exclusive attachments which will only be included in the optional Contact download. We might need a seperate compat mod for that.

@jonpas jonpas mentioned this pull request Jul 25, 2019
Closed
@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

Those classnames are from a discord post. I'd rather wait for the actual config to be out to copy them from there...

Is there a branch to get Contact dev?

@commy2 commy2 added Task 1.94 Contact DLC labels Jul 25, 2019
@commy2 commy2 added this to the 3.12.1 milestone Jul 25, 2019
@dedmen
Copy link
Contributor Author

dedmen commented Jul 25, 2019

Is there a branch to get Contact dev?

It's on RC and dev. Not sure if both are "current" tho.

@PabstMirror
Copy link
Contributor

last I checked there were several JR UBC errors with 1.94 I assumed we would have to fix

@PabstMirror

This comment has been minimized.

Sign in to view
@dedmen
Copy link
Contributor Author

dedmen commented Jul 25, 2019 •
edited
Loading

are these a problem

I think so... Definitely not nice. Need to double check if config inheritance stuff is correct.

more attachments, exclusive to contact (singleplayer, optional part)

optic_Hamr_broken
optic_MRCO_broken
optic_Aco_broken
acc_flashlight_broken
acc_pointer_IR_broken

They require contact (weapons_f_contact) which not everyone has. And if we don't add them, we might/will break the contact campaign.
We remove the vanilla attachments and override it with JR right? so we NEED to add them?

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

We don't remove any vanilla attachments.

@commy2

This comment has been minimized.

Sign in to view
@commy2

This comment has been minimized.

Sign in to view
@commy2 commy2 added the WIP label Jul 25, 2019
@dedmen
Copy link
Contributor Author

dedmen commented Jul 25, 2019

so JR only adds things, not remove anything?

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019 


23:10:46 Cannot delete class PointerSlot, it is referenced somewhere (used as a base class probably).

23:10:46 Updating base class MuzzleSlot_65->asdg_MuzzleSlot_65, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MX_F/WeaponSlotsInfo/MuzzleSlot/ (original (no unload))
23:10:46 Updating base class PointerSlot_Rail->asdg_FrontSideRail, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MX_F/WeaponSlotsInfo/PointerSlot/ (original (no unload))
23:10:46 Updating base class MuzzleSlot_65->asdg_MuzzleSlot_65, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MX_GL_F/WeaponSlotsInfo/MuzzleSlot/ (original (no unload))
23:10:46 Updating base class PointerSlot_Rail->asdg_FrontSideRail, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MX_GL_F/WeaponSlotsInfo/PointerSlot/ (original (no unload))
23:10:46 Updating base class PointerSlot_Rail->asdg_FrontSideRail, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MX_SW_F/WeaponSlotsInfo/PointerSlot/ (original (no unload))
23:10:46 Updating base class PointerSlot_Rail->asdg_FrontSideRail, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_MXM_F/WeaponSlotsInfo/PointerSlot/ (original (no unload))
23:10:46 Updating base class PointerSlot->asdg_FrontSideRail, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_AK12_base_F/WeaponSlotsInfo/PointerSlot/ (original a3\weapons_f_exp\rifles\ak12\config.bin)
23:10:46 Updating base class UnderBarrelSlot_rail->asdg_UnderSlot, by x\cba\addons\jr\config.cpp/CfgWeapons/arifle_AK12_F/WeaponSlotsInfo/UnderBarrelSlot/ (original (no unload))

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

so JR only adds things, not remove anything?

Name anything.

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

Just adding classes from optional components like Contact to the compatibleAddons class results in this when the item class does not exist in master config:

`No entry 'bin\config.bin/CfgWeapons.optic_Aco_broken'.

but I think it can be fixed by more dummy classes :/

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019 •
edited
Loading

"optic_ico_01_black_f","optic_ico_01_camo_f","optic_ico_01_f","optic_ico_01_sand_f" can be ignored. They are optics that are only supposed to fit on the Promet as far as I can tell.

@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

"acc_esd_01_flashlight","muzzleflash_tma" can be ignored too. Esd is a flashlight for some alien pistol and tma is already listed in the new vanilla "jr" class for 6.5 (only used by MX).

@commy2 commy2 removed the WIP label Jul 25, 2019
@commy2
Copy link
Contributor

commy2 commented Jul 25, 2019

Done. Merge?

@commy2 commy2 merged commit 10df1c5 into CBATeam:master Jul 26, 2019
dedmen
dedmen commented Jul 26, 2019
View reviewed changes
addons/jr/Cfgweapons.hpp
// Contact DLC dummies
class acc_flashlight;
class acc_flashlight_broken: acc_flashlight {
scope = 1; // Optional protected class inheriting from a public base class.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aren't we hiding the vanilla stuff? or is it already hidden.

Also you renamed file from cfgweapons -> Cfgweapons. But shouldn't it be CfgWeapons?

Copy link
Contributor

@commy2 commy2 Jul 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aren't we hiding the vanilla stuff? or is it already hidden.

These classes are all protected in Contact. But if I inherit when they don't exist, they would get public from their base classes.

Also you renamed file from cfgweapons -> Cfgweapons. But shouldn't it be CfgWeapons?

Fixed on master

@jonpas jonpas mentioned this pull request Sep 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@commy2 commy2 commy2 left review comments

Assignees
No one assigned
Labels
1.94 Contact DLC Task
Projects
None yet
Milestone
3.12.1
Development

Successfully merging this pull request may close these issues.
3 participants
@dedmen @commy2 @PabstMirror